bitkeeper revision 1.1159.1.494 (41c82fd4CRiE0gO721lqFijHEAIIxA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 21 Dec 2004 14:14:44 +0000 (14:14 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 21 Dec 2004 14:14:44 +0000 (14:14 +0000)
commit2f6070f0b988ef6baa39e5d05a33b9dc29460f82
tree4ceb97280e96620465554b192f3d5710d3fad25b
parent9fd4c697e177eb506f7145351942726a6d79eb38
parentb743fad98e89f1bae29b8f5eb150dbb142bc5109
bitkeeper revision 1.1159.1.494 (41c82fd4CRiE0gO721lqFijHEAIIxA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
xen/arch/x86/shadow.c
xen/arch/x86/x86_32/mm.c